GtkDialog: Keep special-casing help buttons

We used to move help buttons to the secondary position regardless
how they were added to the action area. Keep doing that, to avoid
breaking existing dialogs that rely on this behavior.

https://bugzilla.gnome.org/show_bug.cgi?id=735119

diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 0075f98973a3093a262bb70962e0159abc155d97..3595e25dd9ce9003f957dcd19e3329cfb9df171c 100644 (file)
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -1848,12 +1848,14 @@ gtk_dialog_buildable_custom_finished (GtkBuildable *buildable,
          g_signal_connect_closure_by_id (object, signal_id, 0, closure, FALSE);
        }
 
-      if (is_action)
+      if (gtk_widget_get_parent (GTK_WIDGET (object)) == priv->action_area)
         {
-          if (gtk_widget_get_parent (GTK_WIDGET (object)) == priv->headerbar)
+          apply_response_for_action_area (dialog, GTK_WIDGET (object), ad->response_id);
+        }
+      else if (gtk_widget_get_parent (GTK_WIDGET (object)) == priv->headerbar)
+        {
+          if (is_action)
             apply_response_for_header_bar (dialog, GTK_WIDGET (object), ad->response_id);
-          else if (gtk_widget_get_parent (GTK_WIDGET (object)) == priv->action_area)
-            apply_response_for_action_area (dialog, GTK_WIDGET (object), ad->response_id);
         }
 
       if (item->is_default)